Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE