Merge pi-dr1-dev to aosp-master

Change-Id: I349d4c4cc079663c0f29fa1f9d82bf4837813e48