Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: 004d3bfc3f
am: 78eae8683a

Change-Id: I43b94673d92eebb7f70bc25d12bb4dffeaed60bf