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

Change-Id: If453674691ba03d04333c1ee41697e2e0e9fe772