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

Change-Id: I1d26b974d483b727ff1f023838cd3ac121ffa86c