[automerger skipped] Import translations. DO NOT MERGE am: c0a1b85fe9  -s ours
am: 92947cd4fb  -s ours

Change-Id: Idc3173fcafc9466a73dead3e9a07b5441edbbf25