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

* commit '0e4803fc9585e7a3296b9341c6557513aee3eaa4':
  Revert "Add support for custom manta cling"