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

Change-Id: I0d231354bf08447026c3b7689eaf47053a323948