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

Change-Id: I8b0110dea49791222efab1e91c8e687033d03323