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

* commit '75f63ee49e64abe407ac123068c6e271331e9aee':
  Re-merge "Add support for custom manta cling"