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

Change-Id: I2b6d56ae8c3d0fb90444c4977d60fecbe78d048e