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

Change-Id: I2cc9faee52a7daedbe13a499f80f4ef36e13d0e8