Merge "Refine carrier Wi-Fi functions" into tm-dev