Merge "Fix some broken debug statements and asserts."