Merge "flo: update cleanspec" into jb-mr2-dev