am 270c183d: Merge "Add strings for hierarchical folders" into jb-ub-mail-ur10

* commit '270c183d17da169befda61db8a04edd7a154befd':
  Add strings for hierarchical folders