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

Change-Id: I27985f27d8175ca374e6a63197cdbf087d201bb8