Merge pi-dr1-dev to aosp-master

Change-Id: I3d442242520679fa0067019a8e821c732d89b71d