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

Change-Id: I004526762fdd0786a021f0db315a511fd68ad8f0