Merge change 26188 into eclair

* changes:
  keystore: rename scan() to saw().