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

Change-Id: I677c3f8250d3dee9365ba979135750cd4a4c7ef2