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

Change-Id: I6ffbd1a2c4f53e887b1750126f1e748b9a55261f