[automerger skipped] Import translations. DO NOT MERGE am: 790e02ac33  -s ours
am: b8185a8a62  -s ours

Change-Id: I4d7d34b0433bdd2265cbe53596e2f17882e27bfb