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

Change-Id: I22f3f56acba504247a46b74d32e165b04dceac7f