Merge "Update ActivityEmbedding Usage"