Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 0e618b2c64 am: 549fe98ac8 am: 78831d900d
am: 0283fe2aa4

Change-Id: I004ffceea99eb6591c7136796e3748f39d4814eb