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

Change-Id: I137970a6ba08b0c8ad25eabc35bade39afcea8c0