Merge mainline-prod into master

$ git merge -s ours origin/mainline-prod

There are only two commits not from upstream:
05cdb997
1be26644

But both of these are noops in master (due to Merged-In).

Bug: 168176832
Test: presubmit
Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705