Merge "Fix WCDMA Level Calculation for Default CC" am: 3ada51469a
am: e3db7cfb12

Change-Id: I1772eed2663d6e421a17a268f9fb4844d0118c36