Merge "Update cleanspec to fix build issue" into jb-dev