Merge stage-aosp-master into pi-dev-plus-aosp
am: 81689c30c1

Change-Id: I4f76c9dbdafbe48b33e8e3da38df13493a50bc15