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

Change-Id: Ic47a5752088f2b284e4df3952c1eb0cfad1e91ca