am 4206ee2b: Merge "Fix clear services API" into jb-dev

* commit '4206ee2b680fb2c273c03efc9083e327c7051121':
  Fix clear services API