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

Change-Id: Ia6cf090d16dc04bd25598a9c87fe8cf30f74f504