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

Change-Id: I4ccfee0a3d67922e60f15b2215887099a24bc5fc