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

Change-Id: I3c89dde348a9f374aa78c90a1c3033a1c0fcf638