Merge "init: more unique_fd, less goto" am: 401c9cb330 am: 0908ca721a am: 613fd13dc2
am: bb0c02c06e

Change-Id: I72fe94758c651684fd9edcf7d657bd2c3096596b