Merge "Add a new constant for the NR SA MMWAVE case." into sc-dev