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

Change-Id: I4acd63bbb2d1bb60c71a9bd7b93dafc5f5fdc636