[automerger skipped] Import translations. DO NOT MERGE am: 9a60ed5ff6 -s ours am: bf274e108c -s ours

am skip reason: subject contains skip directive

Change-Id: I9c9b8dfa5e6bcc1e2f4a04437077c84dd3c41a06