Merge commit '055aee28cedc3' into klp-dev: am: 2051465f2e am: d7cab14288 am: cafd00b375 am: 4cea75b987 am: fb5baf6521 am: fa744d0a95 am: f77113a2f7 am: c10d8e4d3b am: e314d1ffe2 am: 75a1d7329b am: 9037e1d2ba am: 838ce87483 am: fead4c9960 am: a2b598aaa1 am: 4d1264b083
am: 613f720f08

Change-Id: Ia12f79f3d9ebe3d6752680b75d3377eeb8b992b4