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

Change-Id: I448a13b5ad1e9b461c60f421b852a423f8c95f11