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

Change-Id: I0c1b445dea12f96812695a91b8457f041310f57f