[automerger skipped] Import translations. DO NOT MERGE
am: 8796603b37 -s ours
am skip reason: subject contains skip directive

Change-Id: Icd6ce08932ca52542ba1bf88a38865e0eabd1592