am 98d7bd72: Merge "Re-merge "Add support for custom manta cling"" into jb-mr1-dev

* commit '98d7bd72df9833b0149dd4772cce710fa4b7476d':
  Re-merge "Add support for custom manta cling"