Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 09cedc44b4
-s ours am: edb4c9c153
-s ours
am: e2880537bc
-s ours
Change-Id: I1849b8d83c40fce7a976d72ebcba1a85ed52c535
This commit is contained in: