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

Change-Id: I27e8b22eb4a9f8aecd35a38cc9ab0de69b82c769