Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5

Change-Id: Icc3d03d869d972959045fd4aac858aeafc4eb3b3