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

Change-Id: I483fe760b31f1cee1f5332aa5c3868a45dd201b9