Merge "lib: heap: Added checks for integer overflow"