Merge "Update ActivityEmbeddingUtils" into tm-dev