Merge "Fix potential memory leak"
tree: 963403ff7fa09ce9d33696526b33fb7034913055
  1. service/