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

Change-Id: I79acd40f5aa64928606ee670f7fec8acd266a081