[automerger skipped] Import translations. DO NOT MERGE am: 4e636b92b9  -s ours
am: ca771d9599  -s ours

Change-Id: Id25ec89ea9852c1c501843a6867ce46da7c486d1