Merge "No longer need to take care of pre boot msg."