[automerger skipped] Import translations. DO NOT MERGE am: 5b0074b434  -s ours
am: 108c4df2b7  -s ours

Change-Id: I44daf3327fa9ec240bd78a286bf6986dc5eb634c