Merge "init: clean up subcontext_test" am: 4e2a8e375e am: be96bdb09d
am: 9beb982787

Change-Id: I17f189d04ac8ce0c16bd5d71aaad316e5249f63f