Merge commit '055aee28cedc3' into klp-dev: am: 2051465f2e am: d7cab14288 am: cafd00b375 am: 4cea75b987 am: fb5baf6521
am: fa744d0a95

Change-Id: Ic63e8b6890a62568130bf95de91a70004bb9977c