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

Change-Id: I5b72057e337de73d1e4bdbf22fbdd0c45a61d344