am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev

* commit '8a893be3f8c00e65a4c45c9615b3f6b547579cd5':
  Fix failing CTS tests.