Merge "Minor fixes for netd restarts and StrictController."
am: 2f5ca257b5

Change-Id: If9a156c516f35c48055012ec6ab7ed5ccaa6b259