Merge pi-dr1-dev to aosp-master

Change-Id: Ida0bc98526f4fc7a1c20f5bbd3210b2f6156d459