Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328
am: 19ec8e7bcf

Change-Id: I82d9a2dcacfac178d91fb57f00a51e2658bd6281