Merge pi-dr1-dev to aosp-master

Change-Id: I2d257bfef9e6ca700471528b5e834af228db09bf