Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: a0980e58e4 -s ours" into nyc-mr2-dev am: d230d7d15d -s ours
am: c2c0535871 -s ours
Change-Id: Iabfb1d2b80f952818a7b290e5adb6ab9aeac4936
This commit is contained in: