Merge pi-dr1-dev to aosp-master

Change-Id: Id5244a30bb57042871f3c91925dac6723ce38bd4