am 6a34c9cd: am 68255cba: Add support for custom manta cling

* commit '6a34c9cd590b67626b504c7893f5667fac893b27':
  Add support for custom manta cling