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

Change-Id: I4eeec561e0f51c2e08c5d1b6a09b26f3b2fb7b76