Merge change 9630

* changes:
  Add support for note and category upload for Contacts