Merge "fs_mgr: Fix MapScratchPartitionIfNeeded signature" am: 838b1a1f94

Change-Id: Iad848705749bfcf5725f9532f00009517cb5355c