Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9e8b15b953  -s ours
am: c125e0ef17  -s ours

Change-Id: I31f30e18d69a1c53aead7d735b69d41a77bdc3df