Merge pi-dr1-dev to aosp-master

Change-Id: I34a37796408b6f375d33676465fa2cc3900f50bd