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

Change-Id: Ie565602c4d25cff80ea061d17a0d760be7a393cd