Merge pi-dr1-dev to aosp-master
am: 63976185f7

Change-Id: I5d036d84eb7eb58c0a7b0fd6247f3013dead7bcf