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

Change-Id: I3e423005e8947d6558d3b0ebc5970421b2fe5b23