Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: f9714a64c8
am: 58c455bfee

Change-Id: I77e9e944fdb434e37594afaa4f21fd5382dc1a27