[automerger skipped] Import translations. DO NOT MERGE am: 17af9260f8 -s ours am: 7ace0fa99b -s ours am: 65baf2fe9a -s ours

am skip reason: subject contains skip directive

Change-Id: I0393104d6f03456583f6782f60e4d9bb1dff80ff