Merge pi-dr1-dev to aosp-master

Change-Id: Icca9e9085feaf5cb0b5ed6ba781ec7e697b4524d