[automerger skipped] Import translations. DO NOT MERGE am: 42838e2ee7 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibe62d47b694403a4331853b4593d6a3a0497eac8