[automerger skipped] Import translations. DO NOT MERGE am: 8289fb18bd  -s ours
am: 9f9f8d2bfc  -s ours

Change-Id: I95bcd60a80a85dd0b837acd5ae95e61ffe81ac27