Merge pi-dr1-dev to aosp-master

Change-Id: I136e45d5a99ed3acec91ac042a6977d7a8f299c3