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

* commit 'a433be70632e02e32dfc2e26f03e7cabb7f0e208':
  Update custom cling params