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

Change-Id: I3a758949cfb272a44dca447cfddaa1174554a03b