Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: f315e2e6f0
-s ours am: 440199c6c4
-s ours
am: fc4fb60597
-s ours
Change-Id: I3c7e9d0f399cc297a6b3c98eb1e9cea4ae66d623
This commit is contained in: