am 37b2bac3: am a433be70: Merge "Update custom cling params" into jb-mr1-dev

* commit '37b2bac33e90411f2bfd0ee1117b595dcc2b50d5':
  Update custom cling params