Merge "Import translations. DO NOT MERGE" into nyc-dev am: 83a23d290d -s ours
am: 00725f1d65 -s ours
* commit '00725f1d65c2db7ee5eda48c5dc683bcfcf885ce':
Change-Id: Icea0228b59b0de3234e50b877d9f86f13c1b660d
This commit is contained in: