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

Change-Id: Ibe3ee83b261d2e2b3ba104e347a1f83aee37b2bb