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

Change-Id: If84b150fb58d631326631482e7afe45d3e104d04