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

Change-Id: I4be5fac5392e9ed399bcd10367bbb94a38a1ef5d