Merge change 22316 into eclair

* changes:
  Cleaning up Presence API