Merge "fs_mgr: validate corrected signatures"