Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: 5f945f25cc
am: 12e2425b4f

Change-Id: Ib0e1b5337b5ecbc844ed2d325a6666d7204c74fa