Merge "init: fix subcontext tests running as non-root."
am: 1b0ea6c3b3

Change-Id: I3d7266c8fc8b748d325af2290e0505f6186ee3e1