Merge "Use unittest.mock instead of third party mock"