Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 7221f5b6b4
-s ours am: 1779cc363d
-s ours
am: d9aa440def
-s ours
Change-Id: I1d3da66f90326916e815a6d22f0940a2b292f2de
This commit is contained in: