Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2  -s ours am: 85e1b30a61  -s ours
am: 2a9bf18182  -s ours

* commit '2a9bf18182743823b2f38c13119f020c1d616925':

Change-Id: I004978983532e5eea12cbc962d4f7f24056bad23