am 9c63cdd6: am ec0f5e5f: Merge "Fix issue #7257947: Need to fix heap limits on Mako" into jb-mr1-dev

* commit '9c63cdd6b0ff28d3a371aa8c6121411fbf7f0a76':
  Fix issue #7257947: Need to fix heap limits on Mako