Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: cf3666f373
am: 7bc69ab3a8

Change-Id: Ibff24442be4431f983d959b2f44c49e02eaed0c7