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

Change-Id: Ib31dd492ab1dba53c6cdaf70e24c7c3a93f21c21