Merge pi-dr1-dev to aosp-master
am: 254f10899a

Change-Id: I83093715ce70eb0d5c0ed87073715c4f7e875431