am 0c9912d0: am b6841a0e: am 9d746d2f: am 91cfc918: am ead0f081: Merge "Add folders to conversation item content description" into ub-gmail-ur14-dev

* commit '0c9912d0d9220ed2112b8c893be28b87d667cecd':
  Add folders to conversation item content description