Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b
-s ours am: 987866df87
-s ours
am: cda385e996
-s ours
Change-Id: I319f972f8593cf853ffe3feef4669d2765e3298a
This commit is contained in: