Merge changes from topic 'svcmgr_shutdown_critical' into oc-dr1-dev
am: 5ebcaf1bb0

Change-Id: I2e51acc6d0c83fd8d3865cdae676e33111d494ee