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

Change-Id: I8875f3f7686f9be5687d2d0f875f468df334f5df