Pass down root_helper in more cases

Change-Id: I3e49764256bb001ccc071c846cd70e4345df017d
Fixes: Bug LP #1226010
Merge "Pass down root_helper in more cases"