Merge "Comment out failing assert"