Merge "fs_mgr: Change scratch margin to 3 X logical_block_size." am: a30cff7f89
am: 8d6ceedc59

Change-Id: If86f32270c7e7d0c799b84ff04ccefdb348d8a05