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

Change-Id: Ie5c9b5f3df4eb4b40118b1509bf6526fd948ae5c