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

Change-Id: I132d7652c1b89089b9b523501b7da6c958a68c8d