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

Change-Id: Iac2c81dec9d0ee05a1002e78802a28eca0770f53