Merge 'goog/mirror-aosp-master' into 'goog/rvc-dev' am: 3d804156b0 am: f34ea21c12

Change-Id: I08ba3a68eff2cdf72cb6bb63c86bd3aa87d717df