Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: 8e6721ce0d
am: 0310b7bc82

Change-Id: Ib45bdef755413b949b62902d055e7f5a46bb644b