[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5f2cebc10a -s ours

am skip reason: subject contains skip directive

Change-Id: Iec96a2a81d4ad75c01c22bf1ff7b73991816155e