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

Change-Id: Ie653c97f14b166e525fca0499a316ba79d94497f