Merge pi-dr1-dev to aosp-master am: f4995c70b4
am: ba5394e9aa

Change-Id: I0979ba2db8122240c7330d6f33ac5311c05f9692