Merge "Remove unnessary assertIsNotNone"