Merge "[DO NOT MERGE] Remove Client Suggestions tests" into tm-dev