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

Change-Id: I971efc2295bc79d2436cdd8c171ed19c4e6b6806