Merge pi-dr1-dev to aosp-master

Change-Id: I845edccccfc352c45c577d221a4d71ba54b2c941