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

am skip reason: subject contains skip directive

Change-Id: Ibac7db9ffa4af2adee660bbf3fe61b5f21495f13