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

Change-Id: Iabca7b78036f9f8151d8fa3434fa8d362912f100