Merge pi-dr1-dev to aosp-master am: 90bffdfe8e
am: 7ea5ed7aa3

Change-Id: I33c0221d4a575b1341e7d417953db2d4faa78057