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

Change-Id: Iea66f070829643814a853c853be24f2db80fd1ce