Merge "Import translations. DO NOT MERGE" into nyc-dev am: 576a32da20 -s ours
am: 1e3d25cc5b -s ours
* commit '1e3d25cc5bbe92c76703b5651624c482c56482d5':
Import translations. DO NOT MERGE
Change-Id: I925a1e240e6831071384b1273e86477b91c1bfb4
This commit is contained in: