Merge pi-dr1-dev to aosp-master am: ce34eb5d95
am: 167bd455a0

Change-Id: I37f8191583da50eb0fcd1c9a54ce8d00f398fec2