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

Change-Id: I61badd336efd01033eddca128c95892ee4605bb8