Merge "Added strings for translation with the expand affordance" into nyc-dev