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

Change-Id: I00e30ff8bf97c9d9141915891006d82631d19fdc