[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 1e036749ba -s ours am: e93ad6e0ea -s ours am: 2e99ad6290 -s ours
am skip reason: subject contains skip directive

Change-Id: I6d8619723b1ae15ddb87167b10eeb5e5b741aaec