Merge pi-dr1-dev to aosp-master am: 8891a0c1cd
am: d0a3438366

Change-Id: I2ecd477e2eabf69a438cd3e8da132707c57eaefb