Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 932de1fab0

Change-Id: I8924f6957f5371f0d4dd9278d172224dc1d9c419