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

Change-Id: I7b70303637913a43d717bb206a2bd6be82c9781f