Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5  -s ours am: 9467382a44  -s ours
am: 4a6a014605  -s ours

Change-Id: I7b16e3b03f740fc5004331e0f4de2ecdc8817c51