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

Change-Id: Ib0e293581138ee1d96119c513ad56eaf5e6544ca