Merge pi-dr1-dev to aosp-master

Change-Id: I16b647b03ad3ecb724664bb8f0deccfbbd28f62c