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

Change-Id: I1b4927cb859e1683ae79f24721a7f008c21c8683