[automerger skipped] Import translations. DO NOT MERGE am: ff79cd7138  -s ours am: d1e4c4119e  -s ours
am: acbe4b7c56  -s ours

Change-Id: I9066965a9e8274bc3154b7267418cd10ac89025a