Merge "init: Don\'t ignore setsockcreatecon errors" am: 07cb69415a am: 17c0edc6ee
am: 5bef33472b

* commit '5bef33472b353535143ce78a68810542f310beef':