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

Change-Id: I090fcf16ac112c4f1ad5cc9b49425c667502e5c0