Merge "Missing CatService shall not be treated as exception"
am: 469c06d208

Change-Id: Ic6380f959a156297ff8e33d61bcba37da480ccfc