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

Change-Id: I19a886c1e1645313304d02787440a893f1cfed2a