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

Change-Id: I17b8dfe84bbafa3d0beb97995d1931ebbc9abf14