Merge "fs_mgr: Fix MapScratchPartitionIfNeeded signature"