Merge "Remove JsonProperty, Use Gson to replace Jackson"