Merge pi-dr1-dev to aosp-master

Change-Id: I2578d09dc4e05aa53108a6a267119676596ad864