[automerger skipped] Merge "Add atom for per-process system ion heap size"...
[automerger skipped] Merge "Add atom for per-process system ion heap size" into qt-dev am: 956197e8 am: fa214b65
am: 85dd6813 -s ours
am skip reason: SHA1 85dd6813 skipped by user rslawik
Change-Id: Ib3dc0566b4464d6644c9f7c7318f94441661b35c