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

Change-Id: Id6edece20054d7725ca206bfa1d6c6b270bcef97