Fix root on "user" variant nightlies

Change-Id: If3ed0b480462a1b6b896a6bc4af51598f3953184