Ensure that correct root helper is used

Fixes bug 1105193

Change-Id: Iaaf0b3687c410f5dbfa152d601ae3b2492a610dd
Merge "Ensure that correct root helper is used"