Merge change 22292 into eclair

* changes:
  Adding a "Photo" directory under Contacts.