am 914d5550: Merge "Revert "Add support for custom manta cling"" into jb-mr1-dev

* commit '914d55501146cf2c3abdf52c021b40fa789d211a':
  Revert "Add support for custom manta cling"