Merge "init: cleanup exit() uses" am: 9c568d0fc0
am: 531cd0f6d3

Change-Id: Idf2f49362e0e969e5e31f698ad963bf7be7a8d8d