Merge "fs_mgr: Change scratch margin to 3 X logical_block_size."