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

Change-Id: Ie92dd6656be973ec2253426cf3b2e04a564cb47b