Merge changes from topic "am-3502b1e6e7cf4ecb9ddfa514f2092c5d"
* changes:
[automerger skipped] Merge "[DO NOT MERGE] Fix founction not found on tm cts tests" into tm-qpr-dev am: 3b3c628f am: 36960320 -s ours
[automerger skipped] [DO NOT MERGE] Fix founction not found on tm cts tests am: 15578338 am: a1757a65 -s ours