[automerger skipped] Import translations. DO NOT MERGE am: 79c1524d26 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifdb8554f200b2a55bb71d892ed7b9a34f40ce6ad