[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: e70d9e3b19 -s ours
am skip reason: subject contains skip directive

Change-Id: I7f6c091edb51532867dbc5e1a2a134ce31d58715