Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 6d17312448

Change-Id: I8c8856a70ef0f414a33bef947181269dc6ce4f69