Merge "Fix failing CTS tests." into lmp-sprout-dev