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

Change-Id: I880d7aecbbd9d24c6cb10c2d15b2024605be87e2