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

Change-Id: I6b3d110d9d392c65e8b965d9b8b1eeb37e8308be