Merge "Fix build break from unnecessary assert."