Merge pi-dr1-dev to aosp-master am: a7712d7cd7
am: 34a4f7a103

Change-Id: Ide8d7bb95120894c415c54e043c47b30e2cadda9