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

Change-Id: Iecf09c5e6eaaecc21962fad2c7c6923634429069