Merge stage-aosp-master into master.
am: eda82090bf

Change-Id: Ibe9b7e630aaa93fd3b4a19145f2382ec4e7f361b