Merge "Fix warning caused by disabled asserts causing unused variables."