am a5024230: am 361e6733: Merge "Fixed failing CTS ConfigTest on KLP" into klp-dev

* commit 'a5024230ded5a5533d265b01c74eb3b38d13f2a3':
  Fixed failing CTS ConfigTest on KLP