Merge "Fix 11az non-TB measurment time unit" into main