[TO_STAGE] Remaining fixes for BZ1014768

These include a fix to a bug in get_mcs_label so pulling into stage.