Merge pi-dr1-dev to aosp-master

Change-Id: I17b39836f4755563c8d54981e9ffdca4600fb2d5