[automerger skipped] Import translations. DO NOT MERGE am: ec7315e039 -s ours am: 4824b956b2 -s ours

am skip reason: subject contains skip directive

Change-Id: I56f20e405cd83891e8f89959c368668f71ee640e