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

Change-Id: I8095846d736e2f5039a87ae4d6da5372088965a9