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

Change-Id: I2e7c4296eba364189e741b7d61a7ff8bd747d127