Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: e4ae0a88c0  -s ours
am: 692737b238  -s ours

Change-Id: Iafe48bf276a60d29d7033bd62fbab49aff4736f8