Merge pi-dr1-dev to aosp-master am: 1808c640de
am: 1ea836e0fd

Change-Id: Icad3ce071c81678012ec57583f33690035a73687