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

Change-Id: If465a82b37c3c2b0caec145f4c8f39493d96baa1