Merge "Shave a stack frame off asserts."