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

Change-Id: Ic82281f24f9994b8350ca3da64766e4370737241