Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 072150db89 -s ours
* commit '072150db89de9fda26bd2150242ab31f9309ec70':
Import translations. DO NOT MERGE
Change-Id: Ic78cdd6faee5831d7fa1a62d3cca0c49f1e0ad1a
This commit is contained in: