Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 38cefbe16a
am: 3d1852877a

Change-Id: Ib9beeaf2db86aefd6eff64abbb969b74de79a9a3