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

Change-Id: I4d2fc3c4fb0ccdb6f292995ced1f7beb5ccb154c