Merge pi-dr1-dev to aosp-master

Change-Id: Iced88a917b8138da52f6ac22d73ff98fc2109b9e