Merge "Minor fixes for netd restarts and StrictController."