Merge change 22459 into eclair

* changes:
  Fixes build due in GeolocationPermissions.