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

am skip reason: subject contains skip directive

Change-Id: Ifa92bf403f3b08b47f647b448277c434f9e3af13