Merge "Revert "Revert "Update TestLifecycleOwner to match converted to ..."" into udc-qpr-dev