Merge "Add memory to sdni build"