Merge change I9efe265f into eclair

* changes:
  unhide AccountManagerResponse