[automerger skipped] Import translations. DO NOT MERGE am: 280cae0879 -s ours am: 3879e0d46c -s ours
am: 5e2b2f0d0a -s ours
am skip reason: subject contains skip directive

Change-Id: Ib104939ec8cbc8552e3077e71db23475cf6b6c84