Merge "Power Monitor Addition frameworks wifi:"