Merge pi-dr1-dev to aosp-master
am: 55ebcc5e97

Change-Id: I0012c808ab240b84cc00c906752bf47c61589c66