[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
am: 39a2390fb9  -s ours

Change-Id: I7ce95669411440d93e113c1f6facd374a9c36241