Merge "add "shutdown critical" to service" into oc-dr1-dev am: 3b15f44041
am: 53d129cdf5

Change-Id: I428c89527549b8fb9df410274622d19ef38a04b0