Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 2027b47914
am: b58447bf32

Change-Id: I5dce047cd7e45a2ee42a4032d8fc0c90aec8e4ff