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

Change-Id: I1c1d7e2491ae3eb8cd247badf88e1b0fc3b207b3