Merge "Removed unnecessary assertions"