Merge "init: handle getpeercon() errors" am: 87882c0a00
am: 12973b0b1e

Change-Id: Ibcb87f4fd3a299026cb432024a97621495dc2fa4