Merge "Fix bug in calculating number of mbs with scaling."