[automerger skipped] Import translations. DO NOT MERGE am: 82f1099361 -s ours am: 0ef8cddcba -s ours
am: 7a66913ac3 -s ours
am skip reason: subject contains skip directive

Change-Id: I8fe1c2066c25dfda853c12d0977f54c6588977ce