am f0c73f5b: Merge "Remove rm_ts_service"

* commit 'f0c73f5b587ed9513a1be05f4ab5cafac9f5f88b':
  Remove rm_ts_service