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

Change-Id: I04e00bb1b56c4d13c63070dec2e7bc0026f1879e