Merge pi-dr1-dev to aosp-master

Change-Id: I62189ff521266066e6776b9e41ad7e033fbfb217