Merge pi-dr1-dev to aosp-master

Change-Id: Ic8a18f54ed43fee4a520fc607d60c1358ab56ab7