Merge pi-dr1-dev to aosp-master

Change-Id: I89b827c5d4ed1fe814dcee13208c9d94b18579f2