Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ecea1bfeae am: 00f28dbb60 am: 2000d1fc94
am: f8e27adec3

Change-Id: I420ae142a9cd3d0e07772fffa5f19702121d764c