Merge "Attend to nits on HsumBootUserInitializer"