Attempt to fix cherry-picks

Change-Id: If71260c2395bc5941977ff9107e4ff3d80a2974a