Merge pi-dr1-dev to aosp-master

Change-Id: I5f9eb0c7ea0a3ba88865854e28b73806011d323e