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

Change-Id: I8c221f52ffbd58770213b8309ca8d6558d676854