Merge pi-dr1-dev to aosp-master

Change-Id: Icd2b61c90aa4f64d125a29948c3153c9bfe8e49c