Merge pi-dr1-dev to aosp-master
am: ba570ad29a

Change-Id: I9aa7b1a25aa924b200190a8afc542b6a63b9a319