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

Change-Id: I9bdcd4d8fbac9fac063aa5e26ad38bd63a67883c