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

Change-Id: If8ea1965dd3c596961e4d71c82c7a2bf54868209