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

Change-Id: I2546a4534cc6183b417cf3e6810070ad57bc9a95