Automatic merge from submit-queue Unable to have optional message slice When making a message slice optional, we need to handle one more conditional case in the rewriter. @wojtek-t