resolve merge conflicts of f4e69fdf to stage-aosp-master

stage-aosp-master already had the CL that was cherry-picked to
aosp/master but the CLs landed together with other CLs so the merge
didn't realize the CL was already applied.

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia41a55653312f82dbf7f2f29f4b8cde368f8d3eb