Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 5854f2aa07 -s ours
* commit '5854f2aa077e5ceba2977724f71162eaf3faa384':
Import translations. DO NOT MERGE
Change-Id: I8e1a06a15432d0599f86bba7c42d7e9d1f2fcd38
This commit is contained in: