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

* commit '361e67331cb5102ac0268308fe75a8f8b7157482':
  Fixed failing CTS ConfigTest on KLP