Merge "Stop clat if it's no longer in use." into jb-mr2-dev