Merge "Rail Power Monitor Addition for wifi"