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

Change-Id: I1d7e2ca3a37bc519bedcf3ac655f5f8ddbf723ed