Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours
am: 5346695e1d -s ours
* commit '5346695e1dffebe8461ef9e2c005e6d595eefea3':
Change-Id: I0b804d6784edca40349c7a593235fe4b01e62956
This commit is contained in: