[automerger skipped] Import translations. DO NOT MERGE
am: 690a287f6c -s ours
am skip reason: subject contains skip directive

Change-Id: Id0d375723501ce34bf174fba0040c265f52939ec