init: cleanup Wi-Fi MAC update service

Change-Id: I57c5f0c6d8b243def6490a70cda71d5ad0cd9749
Merge branch 'remote' into mkl