Merge remote-tracking branch 'goog/mirror-aosp-master' into HEAD

Exempt-From-Owner-Approval: No real owner
Change-Id: Ib30023a2be6155154e60b7eb28aec200adabd1ec