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

Change-Id: Ic049dc8d3347b5b641669857da950b25f28cfb9c