Merge pi-dr1-dev to aosp-master am: efc54655a8
am: 56eb150d27

Change-Id: I1217f1ada3445b2df8d70664f4264e1d396ba239