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

Change-Id: I5789138530ad115a004231a539c5165af1d6358e