Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 3979022626

Change-Id: Ib1286729d3e46ba4ce00ef2b0b2fd6df494922a4