Merge pi-dr1-dev to aosp-master am: e6f992a5df
am: 8ca0519d1f

Change-Id: Ib4993875405f509560fa0a259b5ebda8293a0269