Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours am: b9cc1f603c -s ours
am: 38948cf86d -s ours
Change-Id: Ie362bb496f0f7262399434248f23bf1bbcbea991
This commit is contained in: