Merge "Allow atfwd daemon to find AtCmdFwd service."