am 464b2259: Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE

* commit '464b2259c9c70b36c534e8f2380ff45130a84c66':
  Fix NPE in CatService.encodeOptionalTags.