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

Change-Id: I11eedf2bdf080948b8b69c78476deda66dad309f