Merge "Add CellInfoWcdma and related classes." into jb-mr2-dev