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

Change-Id: Ifae2ac34aa8d541433df173701c542068d2aa504