Merge "Fix clear services API" into jb-dev