[automerger skipped] Import translations. DO NOT MERGE am: f1baf4b921 -s ours
am: fa7aee39de -s ours
am skip reason: subject contains skip directive

Change-Id: I3f1f1da3ada0eb8dc0178f8d305d0160b9dacd77