Merge "Remove unnecessary assertIsNotNone check"