Merge pi-dr1-dev to aosp-master

Change-Id: I7602264f4f2907a98a6b9743f7e3e5ea17cb09e4