Merge pi-dr1-dev to aosp-master am: a40b0e3a11
am: 763f1bc4be

Change-Id: I20409c2ae6fd01088f604425959f628a7d999676