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

Change-Id: Id872f9101234780f19cac483ad369a286375617a