[automerger skipped] Import translations. DO NOT MERGE am: 2f6ed0524e -s ours

am skip reason: subject contains skip directive

Change-Id: I7919efcc5bb4eda2cf60d5119727d4920120ca26