Merge pi-dr1-dev to aosp-master
am: f0885f203e

Change-Id: I8afbd372dc4eeaec5e6066d836b202518ae70421