[automerger skipped] Used the correct CbGeoUtils class am: f3d0f8ccf2 am: 2752aab5ff am: 3a2f5dd8f2 -s ours
am skip reason: Change-Id I97378b70dc1ec541f3552b00b46473b2b2730670 with SHA-1 c8a7a07e25 is in history

Change-Id: I753ee01b71ef4673bc8cfa795bb885cf8488f118