Merge "Import translations. DO NOT MERGE" into arc-apps
am: b4a74ddfca  -s ours

Change-Id: I5122f45fa86881ac6de6309c9a1fbe5edec0c5fa