Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: f315e2e6f0
-s ours am: 672e1ddb14
-s ours
am: 9cfd92d7d8
-s ours
Change-Id: Ib34f4017ca1d32e378b29ff3dc1946b45680015c
This commit is contained in: