Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c906d9dc72 -s ours am: b77af8caca -s ours
am: 0e71f1195b -s ours
Change-Id: If93b30d2f287ca617741a739b1c86cae065cc3bc
This commit is contained in: