updates: remove merged cherry-pick 77758

Change-Id: I50e2048a03247cbe35553826073b61b5d3bee8bc