Merge "Fix WifiLockManager Death link does not exist" into rvc-dev