[automerger skipped] Import translations. DO NOT MERGE am: 31f2a76cd7 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia6ddf11b9713c01ab4dde6825aad897c38a4bbde