Merge stage-aosp-master into pi-dev-plus-aosp
am: ede257f88d

Change-Id: I1961bc8956df3d2726e5d19767632383263b7849