Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:...
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am: 31cf0274" into oc-dr1-dev am: 04bd18fb
am: 6da2b862
Change-Id: I434678eb093574d96d356e90bcc8fdb5825f62a9