Merge "Add tests for setEncapSocketOwner"