Merge "Make clatd a bit more robust when started by netd." into jb-mr2-dev