Merge "init: Fix leaking fd and error print" am: e87a826a1d
am: ff6eb509aa

Change-Id: I053044c34e9a063eb59ae343026abced51b3c7f7