Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
am: 31cf02742e

Change-Id: I8314fcf2fc2fab8f8b4db84cec89efbc6c08660e