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

Change-Id: I434678eb093574d96d356e90bcc8fdb5825f62a9