Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 0e618b2c64 am: 549fe98ac8 am: 78831d900d am: 0283fe2aa4 am: d5bcff74c2 am: ca33924d4d am: dfe327d568 am: c56fe57a0c am: b5d88cc1fa am: fc4cdca25a

Original change: undetermined

Change-Id: I578d68f6e33d79db5fd970695de2fd5bb9a3b533