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

Change-Id: I01b9bdb1cee0f13cddee3692eaa386f43192cc6b