Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa  -s ours am: b77c51b2cf  -s ours
am: 1c39ba201d  -s ours

* commit '1c39ba201d9606c43ad46f55bd1f398933ebcf74':

Change-Id: I8ab6fa2749eeca3e32c2d6254242ed4e8b6f115c