Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev