Merge pi-dr1-dev to aosp-master
am: 043bc0d9be

Change-Id: I1f78c3ca98fcb2582bdfc9f48ceadf630a07988e