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

Change-Id: Ic5aba3cff48d5ad8706804eb918d0b8fff9ec4fb