Merge branch 'bcmgenet-phydev-revert'