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

Change-Id: I1dfd4d89fcb54491706661d28145f5450e804463