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

Change-Id: I214ac0a98aadc4c3a0399a42b6f736f6088cc954