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

* commit '82c0fe723c1542023fe0e61bc628b8a729be1692':
  Re-merge "Add support for custom manta cling"