Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6a983faab3  -s ours
am: 5745dc0e45  -s ours

* commit '5745dc0e452a272dbaebe26e9e7838431b4ce74f':

Change-Id: I5aae9c5e056a03be099e5766cdbd53ded98e435e