Fix cherry-picks

Change-Id: Ib0b061143f3cea3d6a9d98ffaf02c89b5ca5e8f5