[automerger skipped] Import translations. DO NOT MERGE am: ec65ec2df2 -s ours am: d52adc1ba2 -s ours
am: 252cf1487d -s ours
am skip reason: subject contains skip directive

Change-Id: I2e4201fd55b3cbc3acb40b8074d3ba1d177855fb