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

Change-Id: I1856e146fc42e22516f519e4962b85ac8d38d1e6