Merge "use assertIsNotNone instead of assertNotEqual(*, None)"