Merge "init: Change extra_free_kbytes.sh to add margin relative to the default watermark level"