Merge "IPACM: Fix wifi-client header not clean issue"