Merge pi-dr1-dev to aosp-master
am: 913a142594

Change-Id: If705979b86c82d02b6c759a95af67fec0a913b14