Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 4a1e89ba44  -s ours
am: 440c56cef9  -s ours

Change-Id: Ieb971d4109d02d3fd59b2d28681e53235f6e5078