Used the correct CbGeoUtils class am: f3d0f8ccf2 am: 2752aab5ff

Change-Id: I9226635c26f531650e89e943e6c58a93cbf41ae0