Merge pi-dr1-dev to aosp-master
am: 5989a2f631

Change-Id: I17b25b401ebabf42f796474eb4572247fc1d255e