Merge stage-aosp-master into pi-dev-plus-aosp
am: 7395d4794b

Change-Id: I01ed2da69b0e5559bf0eaa5c298bb3aed1830281