fix cherry-pick commit errors

Change-Id: I1ceab348984bcc6e8f181def3609c233d8e06492