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

Change-Id: I66239555d0d08f4b4006f762b29fb94e09cb14d6