Merge change 27142 into eclair

* changes:
  Handle expiration of discovery mode in system server.