[automerger skipped] Import translations. DO NOT MERGE am: 6e879a95b2 -s ours am: 8e955ff80d -s ours

am skip reason: subject contains skip directive

Change-Id: I145de004e44ba836f94cc854361d7a000083a73e