[automerger skipped] Import translations. DO NOT MERGE am: 85185fe58f -s ours

am skip reason: subject contains skip directive

Change-Id: Ied6fede09c1c0e0395d84f15b6c2266164369ca4