Merge pi-dr1-dev to aosp-master

Change-Id: I35abbd415caf9f8f5c5f82b35a4de4c2ee4eedba