init: fix restarting of subcontext am: e70c28bdad am: 18603dab4e

Change-Id: If6e4797c331d7a5a625a6d13c28c46626f89dd86