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

Change-Id: Ic7d3bae780b52236b3fff2ab4d97ce1557129f0f