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

Change-Id: I61067ba96a8366e69898a47881bd0563ef765c1a