Merge pi-dr1-dev to aosp-master

Change-Id: I686564822d93722b7df34d159b2aec736fd1e754