Merge "Fix BSIC Check in CellIdentityGsm" am: 7d615aae59
am: d34107b272

Change-Id: I565c33a88a34950bb788a1c0af6f270342d8c79b