Merge "Fix the wrong MSB_PROTO env value"