Merge pi-dr1-dev to aosp-master

Change-Id: I318c839dbf2416590eade4b7a56ccefee0bece0e