[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f
am: 4bfac58817  -s ours

Change-Id: I910a028d8a4945d0dbbd6334b1d95fc85dd162a1