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

Change-Id: I5b5bb89323cbc01c2e4e2cbfa0554f97a193bd80