Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 401c4b1d00

Change-Id: If4ace9b12ba9049e9f333aafbdb51610c4f98353