Merge "Stop StkAppService when no CatService is available" am: e3fb871d1e am: 5f8032c4a1
am: f88b3f8092

Change-Id: I45726242b5986a931eb9ef5b41abc4503892660e