[automerger skipped] Import translations. DO NOT MERGE am: 4712246f85 -s ours am: a0732755c2 -s ours
am: 1ccfd4f49c -s ours
am skip reason: subject contains skip directive

Change-Id: I25c3def5db40261c32786e5ebd586dbad55b73af