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

Change-Id: I80bbe11a4083d7c8bf50b7d3ce3248f01ef42e27