Merge "Add ActivityId in TranslationContext."