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

* commit '50e1700247fbb552f7b2837915e6752fe609258e':
  Fix NPE in CatService.encodeOptionalTags.