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

Change-Id: I8a449650eb11716f4e44ddea6b455436c9e767c1