Merge "init: fix memory leaks" am: a73ba879b1
am: 1700a162d5

Change-Id: I94dd82e6b7dd9dcb4ebd247d553013dd7e5f98db